Change all g_memdup() to g_memdup2()

Using g_memdup() is dangerous due to the type of the size argument. See
https://gitlab.gnome.org/GNOME/glib/-/issues/2319 and
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1926 for details.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1637>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03455eea058060d199ae23edda1df7459f56aaa4..db621b0730582de0b4aa2627301d2a32e8c49818 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ variables:
     LINT_LOG: "eslint-report.xml"
     LINT_MR_LOG: "eslint-mr-report.xml"
 
-image: registry.gitlab.gnome.org/gnome/mutter/fedora/33:x86_64-2021-01-14.0
+image: registry.gitlab.gnome.org/gnome/mutter/fedora/33:x86_64-2021-02-04.1
 
 workflow:
     rules:

diff --git a/src/st/st-private.c b/src/st/st-private.c
index 2bdcf9b4b9c85a0c6863c3f944739f835f6a4657..5bbefa76316d763320714ced70f498503b68738f 100644 (file)
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -278,7 +278,7 @@ blur_pixels (guchar  *pixels_in,
              gdouble  blur,
              gint    *width_out,
              gint    *height_out,
-             gint    *rowstride_out)
+             size_t  *rowstride_out)
 {
   guchar *pixels_out;
   gdouble sigma;
@@ -295,7 +295,7 @@ blur_pixels (guchar  *pixels_in,
       *width_out  = width_in;
       *height_out = height_in;
       *rowstride_out = rowstride_in;
-      pixels_out = g_memdup (pixels_in, *rowstride_out * *height_out);
+      pixels_out = g_memdup2 (pixels_in, *rowstride_out * *height_out);
     }
   else
     {
@@ -593,7 +593,8 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec_in,
   cairo_pattern_t *dst_pattern;
   guchar          *pixels_in, *pixels_out;
   gint             width_in, height_in, rowstride_in;
-  gint             width_out, height_out, rowstride_out;
+  gint             width_out, height_out;
+  size_t           rowstride_out;
   cairo_matrix_t   shadow_matrix;
   double           xscale_in, yscale_in;
   int i, j;